@agentshouse/kit 0.2.1-cbabe8ad337ff → 0.2.1-cbff58027f078

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 (133) hide show
  1. package/README.md +47 -46
  2. package/dist/acp.js +90 -19
  3. package/dist/afk.js +17 -0
  4. package/dist/agents.js +154 -44
  5. package/dist/api.js +7 -3
  6. package/dist/app-git.js +10 -26
  7. package/dist/authority-main.js +2 -2
  8. package/dist/bridge.js +11 -25
  9. package/dist/building.js +50 -0
  10. package/dist/calls.js +71 -0
  11. package/dist/chatgpt.js +32 -0
  12. package/dist/chunks.js +49 -0
  13. package/dist/clis.js +95 -48
  14. package/dist/connection.js +105 -0
  15. package/dist/conversations.js +574 -179
  16. package/dist/copies.js +431 -218
  17. package/dist/end.js +29 -4
  18. package/dist/enrol-main.js +7 -1
  19. package/dist/events.js +70 -8
  20. package/dist/files.js +139 -31
  21. package/dist/git.js +57 -21
  22. package/dist/home.js +89 -7
  23. package/dist/house-cli.js +299 -0
  24. package/dist/house-main.js +7 -177
  25. package/dist/instructions.js +8 -10
  26. package/dist/kit-cli.js +68 -0
  27. package/dist/kit-main.js +8 -22
  28. package/dist/login.js +113 -23
  29. package/dist/logout.js +0 -2
  30. package/dist/mcp.js +6 -2
  31. package/dist/parts.js +44 -16
  32. package/dist/placement.js +31 -0
  33. package/dist/relay.js +33 -2
  34. package/dist/resident.js +111 -44
  35. package/dist/scope.js +15 -4
  36. package/dist/scripts.js +255 -0
  37. package/dist/service-main.js +9 -0
  38. package/dist/service.js +55 -0
  39. package/dist/sign-in.js +22 -39
  40. package/dist/silence.js +28 -0
  41. package/dist/skills.js +49 -35
  42. package/dist/transcription.js +85 -45
  43. package/dist/translate.js +2 -8
  44. package/dist/update.js +113 -105
  45. package/dist/wire.js +40 -0
  46. package/dist/work.js +3 -5
  47. package/package.json +20 -20
  48. package/dist/bootstrap.json +0 -24
  49. package/dist/clis-main.js +0 -23
  50. package/dist/stream.js +0 -72
  51. package/how-we-work.md +0 -23
  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 -91
  55. package/skills/ask-matt/agents/openai.yaml +0 -4
  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 -116
  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 -140
  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/CONTEXT-FORMAT.md +0 -60
  70. package/skills/domain-modeling/LICENSE +0 -21
  71. package/skills/domain-modeling/SKILL.md +0 -76
  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 -8
  75. package/skills/grill-me/agents/openai.yaml +0 -4
  76. package/skills/grill-with-docs/LICENSE +0 -21
  77. package/skills/grill-with-docs/SKILL.md +0 -8
  78. package/skills/grill-with-docs/agents/openai.yaml +0 -4
  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 -17
  84. package/skills/handoff/agents/openai.yaml +0 -4
  85. package/skills/implement/LICENSE +0 -21
  86. package/skills/implement/SKILL.md +0 -16
  87. package/skills/implement/agents/openai.yaml +0 -4
  88. package/skills/improve-codebase-architecture/HTML-REPORT.md +0 -123
  89. package/skills/improve-codebase-architecture/LICENSE +0 -21
  90. package/skills/improve-codebase-architecture/SKILL.md +0 -72
  91. package/skills/improve-codebase-architecture/agents/openai.yaml +0 -4
  92. package/skills/prototype/LICENSE +0 -21
  93. package/skills/prototype/LOGIC.md +0 -67
  94. package/skills/prototype/SKILL.md +0 -28
  95. package/skills/prototype/UI.md +0 -112
  96. package/skills/prototype/agents/openai.yaml +0 -3
  97. package/skills/research/LICENSE +0 -21
  98. package/skills/research/SKILL.md +0 -14
  99. package/skills/research/agents/openai.yaml +0 -3
  100. package/skills/resolving-merge-conflicts/LICENSE +0 -21
  101. package/skills/resolving-merge-conflicts/SKILL.md +0 -16
  102. package/skills/resolving-merge-conflicts/agents/openai.yaml +0 -3
  103. package/skills/tdd/LICENSE +0 -21
  104. package/skills/tdd/SKILL.md +0 -40
  105. package/skills/tdd/agents/openai.yaml +0 -3
  106. package/skills/tdd/mocking.md +0 -59
  107. package/skills/tdd/tests.md +0 -77
  108. package/skills/teach/GLOSSARY-FORMAT.md +0 -35
  109. package/skills/teach/LEARNING-RECORD-FORMAT.md +0 -46
  110. package/skills/teach/LICENSE +0 -21
  111. package/skills/teach/MISSION-FORMAT.md +0 -31
  112. package/skills/teach/RESOURCES-FORMAT.md +0 -32
  113. package/skills/teach/SKILL.md +0 -141
  114. package/skills/teach/agents/openai.yaml +0 -4
  115. package/skills/to-questionnaire/LICENSE +0 -21
  116. package/skills/to-questionnaire/SKILL.md +0 -55
  117. package/skills/to-questionnaire/agents/openai.yaml +0 -4
  118. package/skills/to-spec/LICENSE +0 -21
  119. package/skills/to-spec/SKILL.md +0 -76
  120. package/skills/to-spec/agents/openai.yaml +0 -4
  121. package/skills/to-tickets/LICENSE +0 -21
  122. package/skills/to-tickets/SKILL.md +0 -106
  123. package/skills/to-tickets/agents/openai.yaml +0 -4
  124. package/skills/wait-what/LICENSE +0 -21
  125. package/skills/wait-what/SKILL.md +0 -8
  126. package/skills/wait-what/agents/openai.yaml +0 -4
  127. package/skills/wayfinder/LICENSE +0 -21
  128. package/skills/wayfinder/SKILL.md +0 -129
  129. package/skills/wayfinder/agents/openai.yaml +0 -4
  130. package/skills/writing-for-agents/LICENSE +0 -21
  131. package/skills/writing-for-agents/SKILL-MECHANICS.md +0 -22
  132. package/skills/writing-for-agents/SKILL.md +0 -83
  133. package/skills/writing-for-agents/agents/openai.yaml +0 -3
package/dist/login.js CHANGED
@@ -1,12 +1,17 @@
1
1
  import { spawn } from 'node:child_process';
2
2
  import { createHash, randomBytes } from 'node:crypto';
3
- import { hostname } from 'node:os';
4
3
  import { parseArgs } from 'node:util';
5
- import { post, retrying } from './api.js';
4
+ import { HouseRefusal, post, retrying } from './api.js';
6
5
  import { placeAppGit } from './app-git.js';
7
- import { forgetOwnAgent, readDisconnected, readEnrolment, readOwnAgent, writeEnrolment, writeOwnAgent } from './home.js';
6
+ import { writeCodexRule } from './clis.js';
7
+ import { forgetDisconnected, forgetOwnAgent, readDisconnected, readEnrolment, readOwnAgent, writeEnrolment, writeOwnAgent, } from './home.js';
8
8
  import { callHouse, rpc } from './mcp.js';
9
- const DEFAULT_HOUSE = 'https://agents.house';
9
+ import { refusalOf } from './refusals.js';
10
+ import { selectRelay } from './relay.js';
11
+ import { startService } from './service.js';
12
+ import { placeSkillSet } from './skills.js';
13
+ import { endUnserved } from './wire.js';
14
+ export const DEFAULT_HOUSE = 'https://agents.house';
10
15
  const OPENER = process.platform === 'darwin' ? 'open' : 'xdg-open';
11
16
  // Polling every two seconds brings the User's confirmation to the waiting Kit moments after they give it.
12
17
  const POLL_INTERVAL_MS = 2000;
@@ -15,47 +20,132 @@ function open(link) {
15
20
  .on('error', () => undefined)
16
21
  .unref();
17
22
  }
18
- async function accepted(house, credential) {
23
+ export async function accepted(house, credential) {
19
24
  const checked = await callHouse(house, credential, rpc('tools/list', {}));
20
25
  if (checked.status === 200)
21
26
  return true;
22
27
  if (checked.status === 401)
23
28
  return false;
29
+ endUnserved(checked.text);
24
30
  throw new Error(`House answered ${checked.status} when Kit checked this computer's own agent's connection: ${checked.text}`);
25
31
  }
32
+ const USAGE = `usage: kit login [--house <origin>] [--environment <id>] [--rooms <ref>[,<ref>...] | --no-private]
33
+ kit login [--house <origin>] --code <code>
34
+ --house <origin> the House to connect to, ${DEFAULT_HOUSE} unless one is stored
35
+ --environment <id> reconnect this Environment
36
+ --rooms <ref>[,<ref>...] give this Environment only these Rooms
37
+ --no-private give this Environment every Room but your Private Room
38
+ --code <code> connect this machine with a login code
39
+ `;
40
+ function connected(house, named, environment) {
41
+ if (named === undefined)
42
+ return `Environment ${environment} is connected to ${house}.\n`;
43
+ if (named === environment)
44
+ return `Environment ${environment} is reconnected to ${house}.\n`;
45
+ return `Environment ${named} stays with its account; this computer is connected to ${house} as new Environment ${environment} of the account that confirmed.\n`;
46
+ }
47
+ function gone(error) {
48
+ return error instanceof HouseRefusal && refusalOf(error.text)?.code === 'kit_environment_not_found';
49
+ }
50
+ function chosenRooms(rooms, noPrivate) {
51
+ if (rooms !== undefined && noPrivate)
52
+ throw new Error('--rooms and --no-private are two choices of Rooms; pass one');
53
+ if (rooms !== undefined)
54
+ return { rooms: { reach: 'selected', refs: rooms.split(',') } };
55
+ return noPrivate ? { rooms: { reach: 'all_but_private' } } : {};
56
+ }
26
57
  export async function login(argv) {
27
58
  const { values } = parseArgs({
28
59
  args: argv,
29
60
  options: {
30
61
  house: { type: 'string' },
31
62
  environment: { type: 'string' },
63
+ rooms: { type: 'string' },
64
+ 'no-private': { type: 'boolean', default: false },
65
+ code: { type: 'string' },
66
+ help: { type: 'boolean', default: false },
32
67
  },
33
68
  });
69
+ if (values.help) {
70
+ process.stdout.write(USAGE);
71
+ return;
72
+ }
73
+ if (values.code !== undefined && values.rooms !== undefined)
74
+ throw new Error('--code cannot be used with --rooms');
75
+ if (values.code !== undefined && values['no-private'])
76
+ throw new Error('--code cannot be used with --no-private');
77
+ if (values.code !== undefined && values.environment !== undefined)
78
+ throw new Error('--code cannot be used with --environment');
79
+ const rooms = chosenRooms(values.rooms, values['no-private']);
34
80
  const enrolled = (await readEnrolment()) ?? (await readDisconnected());
81
+ if (values.code !== undefined && enrolled !== null) {
82
+ throw new Error(`--code connects a new machine; this Kit home records Environment ${enrolled.environment}, so run kit login to reconnect it`);
83
+ }
84
+ const relay = process.env.HOUSE_KIT_RELAY || undefined;
85
+ selectRelay(relay);
35
86
  const house = values.house ?? enrolled?.house ?? DEFAULT_HOUSE;
36
87
  const replaces = process.env.HOUSE_KIT_REPLACES;
37
- const environment = replaces === undefined ? (values.environment ?? (enrolled?.house === house ? enrolled.environment : undefined)) : undefined;
88
+ const remembered = replaces === undefined && values.environment === undefined && enrolled?.house === house ? enrolled.environment : undefined;
89
+ const environment = replaces === undefined ? (values.environment ?? remembered) : undefined;
38
90
  const ownAgent = await readOwnAgent();
39
- const held = ownAgent !== null && ownAgent.house === house && (await accepted(house, ownAgent.credential));
40
- const verifier = randomBytes(32).toString('base64url');
41
- const started = await retrying(() => post(house, '/kit', {
42
- ...(environment === undefined
43
- ? { act: 'new_environment', label: hostname(), ...(replaces === undefined ? {} : { replaces }) }
44
- : { act: 'existing_environment', environment_id: environment }),
45
- code_challenge: createHash('sha256').update(verifier).digest('base64url'),
46
- ...(held ? {} : { headless: true }),
47
- }));
48
- process.stdout.write(`Open this link and confirm: ${started.start_url}\n`);
49
- open(started.start_url);
50
- const exchanged = await retrying(() => post(house, '/kit/token', { login: started.login, code_verifier: verifier }), undefined, () => POLL_INTERVAL_MS);
51
- await writeEnrolment({ house, environment: exchanged.environment, credential: exchanged.credential });
52
- process.stdout.write(`Environment ${exchanged.environment} is connected to ${house}.\n`);
91
+ let held = false;
92
+ let named = environment;
93
+ let exchanged;
94
+ if (values.code !== undefined) {
95
+ exchanged = await post(house, '/kit/token', { code: values.code });
96
+ }
97
+ else {
98
+ held = ownAgent !== null && ownAgent.house === house && (await accepted(house, ownAgent.credential));
99
+ const verifier = randomBytes(32).toString('base64url');
100
+ const start = () => retrying(() => post(house, '/kit', {
101
+ ...(named === undefined
102
+ ? { act: 'new_environment', ...(replaces === undefined ? {} : { replaces }) }
103
+ : { act: 'existing_environment', environment_id: named }),
104
+ ...rooms,
105
+ code_challenge: createHash('sha256').update(verifier).digest('base64url'),
106
+ ...(held ? {} : { headless: true }),
107
+ }));
108
+ let started;
109
+ try {
110
+ started = await start();
111
+ }
112
+ catch (error) {
113
+ if (remembered === undefined || !gone(error))
114
+ throw error;
115
+ await forgetDisconnected();
116
+ process.stdout.write(`House no longer holds Environment ${remembered}; connecting this computer as a new one.\n`);
117
+ named = undefined;
118
+ started = await start();
119
+ }
120
+ process.stdout.write(`Open this link and confirm: ${started.start_url}\n`);
121
+ open(started.start_url);
122
+ exchanged = await retrying(() => post(house, '/kit/token', { login: started.login, code_verifier: verifier }), undefined, () => POLL_INTERVAL_MS);
123
+ }
124
+ await placeSkillSet(house);
125
+ await writeCodexRule().catch((error) => process.stderr.write(`kit: ${error.message}\n`));
126
+ const relayRecord = relay === undefined ? {} : { relay };
127
+ await writeEnrolment({
128
+ house,
129
+ ...relayRecord,
130
+ environment: exchanged.environment,
131
+ credential: exchanged.credential,
132
+ });
133
+ process.stdout.write(connected(house, named, exchanged.environment));
53
134
  if (exchanged.headless_credential !== undefined) {
54
- await writeOwnAgent({ house, user: exchanged.user, credential: exchanged.headless_credential });
135
+ await writeOwnAgent({ house, ...relayRecord, user: exchanged.user, credential: exchanged.headless_credential });
55
136
  }
56
- else if (held && ownAgent.user !== exchanged.user) {
137
+ else if (held && ownAgent !== null && ownAgent.user !== exchanged.user) {
57
138
  await forgetOwnAgent();
58
139
  process.stdout.write("This computer's own agent was another User's; run kit login again to connect it to you.\n");
59
140
  }
60
- await placeAppGit(ownAgent, await readOwnAgent());
141
+ else if (held && ownAgent !== null) {
142
+ await writeOwnAgent({ house, ...relayRecord, user: ownAgent.user, credential: ownAgent.credential });
143
+ }
144
+ await placeAppGit(await readOwnAgent()).catch((error) => process.stderr.write(`kit: ${error.message}\n`));
145
+ try {
146
+ startService();
147
+ }
148
+ catch (error) {
149
+ process.stderr.write(`kit: ${error.message}\n`);
150
+ }
61
151
  }
package/dist/logout.js CHANGED
@@ -1,5 +1,4 @@
1
1
  import { HouseRefusal, post } from './api.js';
2
- import { forgetAppGit } from './app-git.js';
3
2
  import { forgetEnrolment, forgetOwnAgent, readEnrolment } from './home.js';
4
3
  export async function logout() {
5
4
  const enrolled = await readEnrolment();
@@ -13,7 +12,6 @@ export async function logout() {
13
12
  }
14
13
  await forgetEnrolment(enrolled);
15
14
  }
16
- await forgetAppGit();
17
15
  await forgetOwnAgent();
18
16
  process.stdout.write(enrolled === null
19
17
  ? 'This computer is not connected to House.\n'
package/dist/mcp.js CHANGED
@@ -1,8 +1,11 @@
1
1
  import { randomUUID } from 'node:crypto';
2
- import { KIT_VERSION } from './clis.js';
2
+ import { KIT_RELEASE } from './clis.js';
3
3
  import { relayed } from './relay.js';
4
+ import { KIT_WIRE, KIT_WIRE_HEADER } from './wire.js';
4
5
  const MCP_PROTOCOL_VERSION = '2026-07-28';
5
6
  export const UNREACHABLE = 'House is unreachable; call again in a minute';
7
+ export class Unsettled extends Error {
8
+ }
6
9
  export function rpc(method, params) {
7
10
  return { jsonrpc: '2.0', id: randomUUID(), method, params };
8
11
  }
@@ -13,7 +16,7 @@ export function mcpBody(message, operation) {
13
16
  ...message.params,
14
17
  _meta: {
15
18
  'io.modelcontextprotocol/protocolVersion': MCP_PROTOCOL_VERSION,
16
- 'io.modelcontextprotocol/clientInfo': { name: '@agentshouse/kit', version: KIT_VERSION },
19
+ 'io.modelcontextprotocol/clientInfo': { name: '@agentshouse/kit', version: KIT_RELEASE },
17
20
  'io.modelcontextprotocol/clientCapabilities': {},
18
21
  ...(operation === null ? {} : { 'agents.house/agent-operation': operation }),
19
22
  },
@@ -31,6 +34,7 @@ export async function callHouse(origin, credential, message, operation = null, s
31
34
  'mcp-protocol-version': MCP_PROTOCOL_VERSION,
32
35
  'mcp-method': message.method,
33
36
  ...(tool === null ? {} : { 'mcp-name': tool }),
37
+ [KIT_WIRE_HEADER]: String(KIT_WIRE),
34
38
  },
35
39
  body: mcpBody(message, operation),
36
40
  signal,
package/dist/parts.js CHANGED
@@ -1,8 +1,21 @@
1
+ export function addedTokens(sum, tokens) {
2
+ if (sum === null)
3
+ return tokens;
4
+ return {
5
+ input: sum.input + tokens.input,
6
+ output: sum.output + tokens.output,
7
+ cache_read: sum.cache_read + tokens.cache_read,
8
+ cache_write: sum.cache_write + tokens.cache_write,
9
+ };
10
+ }
1
11
  export class Parts {
2
12
  parts = [];
3
13
  context = null;
4
14
  emit;
15
+ made = [];
16
+ events = 0;
5
17
  writing = null;
18
+ counting = null;
6
19
  planned = null;
7
20
  constructor(emit) {
8
21
  this.emit = emit;
@@ -10,32 +23,34 @@ export class Parts {
10
23
  write(type, id, text) {
11
24
  if (text === '')
12
25
  return;
13
- const last = this.parts.length - 1;
14
- const part = this.parts[last];
15
- if (this.writing?.type === type && this.writing.id === id && part?.type === type) {
16
- part.text += text;
17
- this.emit({ op: 'append', index: last, text });
26
+ if (this.writing?.type === type && this.writing.id === id) {
27
+ this.parts[this.writing.index].text += text;
28
+ this.emit({ op: 'append', index: this.writing.index, text });
18
29
  return;
19
30
  }
20
- this.start({ type, text });
21
- this.writing = { type, id };
31
+ this.writing = { type, id, index: this.start({ type, text }) };
22
32
  }
23
33
  command() {
24
- const last = this.parts.length - 1;
25
- const part = this.parts[last];
26
- if (part?.type !== 'commands') {
27
- this.start({ type: 'commands', count: 1 });
34
+ if (this.counting === null) {
35
+ this.counting = this.start({ type: 'commands', count: 1 });
28
36
  return;
29
37
  }
38
+ const part = this.parts[this.counting];
30
39
  part.count++;
31
- this.emit({ op: 'count', index: last, count: part.count });
40
+ this.emit({ op: 'count', index: this.counting, count: part.count });
32
41
  }
33
42
  start(part) {
34
43
  this.writing = null;
35
- this.parts.push(part);
36
- const index = this.parts.length - 1;
37
- this.emit({ op: 'start', index, part });
38
- return index;
44
+ this.counting = null;
45
+ return this.add(part, ++this.events);
46
+ }
47
+ reserve() {
48
+ this.writing = null;
49
+ this.counting = null;
50
+ return ++this.events;
51
+ }
52
+ arrive(part, reserved) {
53
+ this.add(part, reserved);
39
54
  }
40
55
  done(index, result) {
41
56
  const part = this.parts[index];
@@ -55,10 +70,23 @@ export class Parts {
55
70
  this.context = context;
56
71
  this.emit({ op: 'context', ...context });
57
72
  }
73
+ saved() {
74
+ return this.parts
75
+ .map((part, index) => ({ part, made: this.made[index] }))
76
+ .sort((a, b) => a.made - b.made)
77
+ .map(({ part }) => part);
78
+ }
58
79
  operations() {
59
80
  return [
60
81
  ...this.parts.map((part, index) => ({ op: 'start', index, part })),
61
82
  ...(this.context === null ? [] : [{ op: 'context', ...this.context }]),
62
83
  ];
63
84
  }
85
+ add(part, made) {
86
+ this.parts.push(part);
87
+ this.made.push(made);
88
+ const index = this.parts.length - 1;
89
+ this.emit({ op: 'start', index, part });
90
+ return index;
91
+ }
64
92
  }
@@ -0,0 +1,31 @@
1
+ import { readFileSync } from 'node:fs';
2
+ import { join, resolve } from 'node:path';
3
+ import { kitHome } from './home.js';
4
+ function recorded(name) {
5
+ try {
6
+ return readFileSync(join(kitHome(), name), 'utf8').trim();
7
+ }
8
+ catch (error) {
9
+ if (error.code === 'ENOENT')
10
+ return null;
11
+ throw error;
12
+ }
13
+ }
14
+ export function installCommand() {
15
+ return recorded('install-command');
16
+ }
17
+ export function machine() {
18
+ const placed = recorded('placement');
19
+ if (placed === 'container' || placed === 'server' || placed === 'windows')
20
+ return placed;
21
+ return process.platform === 'darwin' ? 'macos' : 'linux';
22
+ }
23
+ export function placedPrefix() {
24
+ const prefix = process.env.HOUSE_KIT_PREFIX;
25
+ if (prefix === undefined || prefix === '')
26
+ throw new Error('this Kit process was not started by a launcher its installer placed');
27
+ return resolve(prefix);
28
+ }
29
+ export function releaseDirectory(release) {
30
+ return join(placedPrefix(), 'releases', release);
31
+ }
package/dist/relay.js CHANGED
@@ -1,7 +1,38 @@
1
+ import { setGlobalProxyFromEnv } from 'node:http';
2
+ const PROXY = /^https?_proxy$/i;
3
+ const LOOPBACK = ['127.0.0.1', 'localhost', '::1'];
4
+ let selected;
5
+ let restoreProxy;
6
+ export function selectRelay(relay) {
7
+ selected = relay === undefined || relay === '' ? null : relay;
8
+ proxyUnlessRelayed();
9
+ }
10
+ export function relayOrigin() {
11
+ if (selected !== undefined)
12
+ return selected ?? undefined;
13
+ const ambient = process.env.HOUSE_KIT_RELAY;
14
+ return ambient === undefined || ambient === '' ? undefined : ambient;
15
+ }
16
+ function unlessRelayed() {
17
+ if (relayOrigin() === undefined)
18
+ return { ...process.env };
19
+ return Object.fromEntries(Object.entries(process.env).filter(([name]) => !PROXY.test(name)));
20
+ }
21
+ export function proxyUnlessRelayed() {
22
+ restoreProxy?.();
23
+ restoreProxy = setGlobalProxyFromEnv(unlessRelayed());
24
+ }
25
+ export function childEnvironment() {
26
+ const environment = unlessRelayed();
27
+ if (!Object.keys(environment).some((name) => PROXY.test(name)))
28
+ return environment;
29
+ const bypassed = [environment.NO_PROXY ?? environment.no_proxy, ...LOOPBACK].filter((entry) => entry !== undefined && entry !== '').join(',');
30
+ return { ...environment, NO_PROXY: bypassed, no_proxy: bypassed };
31
+ }
1
32
  export function relayed(target) {
2
33
  const url = new URL(target);
3
- const relay = process.env.HOUSE_KIT_RELAY;
4
- if (relay === undefined || relay === '')
34
+ const relay = relayOrigin();
35
+ if (relay === undefined)
5
36
  return url;
6
37
  const through = new URL(`${url.host}${url.pathname}${url.search}`, `${relay}/`);
7
38
  if (url.protocol === 'wss:' || url.protocol === 'ws:')
package/dist/resident.js CHANGED
@@ -1,21 +1,26 @@
1
1
  import { once } from 'node:events';
2
2
  import { watch } from 'node:fs';
3
3
  import { mkdir, rm, writeFile } from 'node:fs/promises';
4
- import { createServer } from 'node:http';
4
+ import { createServer, get } from 'node:http';
5
5
  import { dirname, extname, join } from 'node:path';
6
+ import { DatabaseSync } from 'node:sqlite';
6
7
  import { fileURLToPath } from 'node:url';
7
8
  import { Agents } from './agents.js';
8
9
  import { house } from './api.js';
9
10
  import { received } from './bridge.js';
10
- import { Conversations } from './conversations.js';
11
+ import { CONVERSATION_METHODS, Conversations } from './conversations.js';
11
12
  import { LocalCopies } from './copies.js';
12
- import { agentBase, enrolled, kitHome } from './home.js';
13
+ import { restart, unknownMethod } from './end.js';
14
+ import { agentBase, enrolled, kitHome, ownerLock, ownerSocket, readEnrolment } from './home.js';
15
+ import { Calls } from './calls.js';
13
16
  import { killDescendants } from './scope.js';
17
+ import { removeInputs, Scripts } from './scripts.js';
14
18
  import { quoted } from './shell.js';
15
19
  import { SignIns } from './sign-in.js';
16
20
  import { placeSkillSet } from './skills.js';
17
- import { holdStream } from './stream.js';
18
- import { Updates } from './update.js';
21
+ import { holdConnection } from './connection.js';
22
+ import { KitUpdate } from './update.js';
23
+ import { takeUnservedRelease } from './wire.js';
19
24
  import { codexLauncher } from './work.js';
20
25
  function report(error) {
21
26
  process.stderr.write(`kit: ${error instanceof Error ? error.message : String(error)}\n`);
@@ -28,26 +33,66 @@ async function installShim(path, module) {
28
33
  await mkdir(dirname(path), { recursive: true });
29
34
  await writeFile(path, `#!/bin/sh\nexec ${quoted(process.execPath)} ${quoted(main)} "$@"\n`, { mode: 0o755 });
30
35
  }
36
+ function claimed(lock) {
37
+ try {
38
+ lock.exec('BEGIN EXCLUSIVE');
39
+ return true;
40
+ }
41
+ catch (error) {
42
+ if (error.errcode === 5)
43
+ return false;
44
+ throw error;
45
+ }
46
+ }
31
47
  async function serveOwner(copies) {
32
- const socketPath = join(kitHome(), 'owner.sock');
33
- await rm(socketPath, { force: true });
48
+ const lock = new DatabaseSync(ownerLock());
49
+ if (!claimed(lock)) {
50
+ lock.close();
51
+ const running = await runningResident();
52
+ throw new Error(`${running === null ? 'another Kit process' : `Kit process ${running}`} already runs this Environment from Kit home ${kitHome()}; stop it first to run another Kit process here`);
53
+ }
34
54
  const server = createServer(async (request, response) => {
35
55
  try {
36
- if (request.url !== '/git/push') {
56
+ const text = await received(request);
57
+ let answered;
58
+ if (request.url === '/resident') {
59
+ response.writeHead(200, { 'content-type': 'application/json' }).end(JSON.stringify({ pid: process.pid }));
60
+ return;
61
+ }
62
+ if (request.url === '/git/fetch') {
63
+ answered = await copies.fetch();
64
+ }
65
+ else if (request.url === '/git/push') {
66
+ const { cwd, commit } = JSON.parse(text);
67
+ answered = await copies.push(cwd, commit, copies.owner);
68
+ }
69
+ else {
37
70
  response.writeHead(404).end();
38
71
  return;
39
72
  }
40
- const { cwd, commit } = JSON.parse(await received(request));
41
- const pushed = await copies.push(cwd, commit, copies.owner);
42
- response.writeHead(200, { 'content-type': 'application/json' }).end(JSON.stringify(pushed));
73
+ response.writeHead(200, { 'content-type': 'application/json' }).end(JSON.stringify(answered));
43
74
  }
44
75
  catch (error) {
45
76
  response.writeHead(502).end(error instanceof Error ? error.message : String(error));
46
77
  }
47
78
  });
48
- server.listen(socketPath);
79
+ server.on('close', () => lock.close());
80
+ await rm(ownerSocket(), { force: true });
81
+ server.listen(ownerSocket());
49
82
  await once(server, 'listening');
50
83
  }
84
+ function runningResident() {
85
+ return new Promise((resolve, reject) => {
86
+ get({ socketPath: ownerSocket(), path: '/resident' }, (answer) => {
87
+ received(answer).then((text) => resolve(JSON.parse(text).pid), reject);
88
+ }).on('error', (error) => {
89
+ if (error.code === 'ENOENT' || error.code === 'ECONNREFUSED')
90
+ resolve(null);
91
+ else
92
+ reject(error);
93
+ });
94
+ });
95
+ }
51
96
  function connected() {
52
97
  return new Promise((resolve) => {
53
98
  const watcher = watch(kitHome(), () => {
@@ -64,7 +109,7 @@ function connected() {
64
109
  resolve();
65
110
  });
66
111
  }
67
- export async function resident() {
112
+ async function started() {
68
113
  await connected();
69
114
  watch(kitHome(), () => {
70
115
  if (enrolled())
@@ -72,70 +117,92 @@ export async function resident() {
72
117
  killDescendants();
73
118
  process.exit(1);
74
119
  });
75
- await placeSkillSet();
120
+ await placeSkillSet((await readEnrolment()).house);
76
121
  await mkdir(agentBase(), { recursive: true });
77
- process.env.HOUSE_KIT_RESIDENT = String(process.pid);
78
- const agents = new Agents(house);
79
- const copies = new LocalCopies(house);
80
- await copies.load();
81
122
  await installShim(join(kitHome(), 'shim', 'git'), 'git-main');
82
123
  await installShim(codexLauncher(), 'codex-main');
124
+ }
125
+ export async function resident() {
126
+ await mkdir(kitHome(), { recursive: true, mode: 0o700 });
127
+ const copies = new LocalCopies(house);
128
+ await copies.load();
83
129
  await serveOwner(copies);
84
- let stream = null;
130
+ await copies.swept();
131
+ await started().catch((error) => {
132
+ report(error);
133
+ process.exit(1);
134
+ });
135
+ process.env.HOUSE_KIT_RESIDENT = String(process.pid);
136
+ const agents = new Agents(house, () => changed());
137
+ let connection = null;
85
138
  let reported = false;
86
- const idle = () => conversations.idle() && signIns.idle();
139
+ const idle = () => calls.idle() && conversations.idle() && agents.idle();
87
140
  const changed = () => {
88
141
  if (!idle()) {
89
142
  reported = false;
90
143
  }
144
+ else if (update.placedRelease() !== null && conversations.quiet()) {
145
+ restart(`Kit ${update.placedRelease()} is placed; its supervisor starts it`);
146
+ }
91
147
  else if (!reported) {
92
148
  reported = true;
93
149
  logged(house.deliver('/kit/idle', {}, idle));
94
150
  }
95
151
  };
152
+ const calls = new Calls(house, changed);
96
153
  const conversations = new Conversations({
97
154
  house,
98
155
  agents,
99
156
  copies,
100
- send: (frame) => stream?.send(frame) ?? false,
157
+ calls,
158
+ send: (notification) => connection?.send(notification) ?? false,
101
159
  changed,
102
160
  });
103
- const signIns = new SignIns(house, agents, changed);
104
- const updates = new Updates(house);
161
+ const signIns = new SignIns(house, agents, calls);
162
+ const update = new KitUpdate(calls);
163
+ if (process.env.HOUSE_KIT_SANDBOX !== '1')
164
+ takeUnservedRelease((release) => logged(update.takeRefused(release)));
165
+ removeInputs();
166
+ const scripts = new Scripts(calls, (notification) => connection?.send(notification) ?? false);
105
167
  for (const signal of ['SIGTERM', 'SIGINT']) {
106
168
  process.once(signal, () => {
107
169
  killDescendants();
170
+ removeInputs();
108
171
  process.kill(process.pid, signal);
109
172
  });
110
173
  }
111
174
  await house.deliver('/kit/restarted', {}).catch(report);
112
- await updates.resumed().catch(report);
113
175
  logged(agents.refresh());
114
- stream = holdStream({
176
+ agents.keepCurrent();
177
+ connection = holdConnection({
115
178
  opened: () => {
116
179
  conversations.opened();
117
180
  changed();
118
- logged(copies.select());
181
+ logged(copies.connected());
119
182
  },
120
- frame: (arrived) => {
121
- if (arrived.type === 'watching')
122
- conversations.watching(arrived.watching === true);
123
- if (arrived.type === 'work_available' && arrived.subject === 'agents')
124
- logged(agents.refresh());
125
- if (arrived.type === 'work_available' && arrived.subject === 'local_copy')
126
- logged(copies.select());
127
- if (arrived.type === 'entries') {
128
- copies.entries(arrived);
129
- }
130
- if (arrived.type === 'input') {
131
- reported = false;
132
- if (arrived.kind === 'sign_in')
133
- signIns.start(arrived);
134
- else if (arrived.kind === 'update')
135
- updates.start(arrived);
136
- else
137
- conversations.input(arrived);
183
+ closed: () => scripts.disconnected(),
184
+ call: (call) => {
185
+ if (call.kind === 'sign_in')
186
+ signIns.start(call);
187
+ else if (call.kind === 'update')
188
+ update.take(call);
189
+ else if (call.kind === 'run_wizard' || call.kind === 'run_function')
190
+ scripts.start(call);
191
+ else if (CONVERSATION_METHODS.has(call.kind))
192
+ conversations.call(call);
193
+ else {
194
+ const refused = { refused: unknownMethod(call.kind) };
195
+ void calls.carry(call.input_id, async () => ({ result: refused }));
138
196
  }
139
197
  },
198
+ notification: (notification) => {
199
+ if (notification.type === 'watching')
200
+ conversations.watching(notification.watching === true);
201
+ if (notification.type === 'authority_changed')
202
+ logged(copies.changed(notification.rooms));
203
+ if (notification.type === 'work_available' && notification.subject === 'agents')
204
+ logged(agents.refresh());
205
+ scripts.notified(notification);
206
+ },
140
207
  });
141
208
  }